Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 31 May 2010 11:48:23 +0000 (11:48 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 31 May 2010 11:48:23 +0000 (11:48 +0000)
commitbf3f83cc65d942378a6a326ca45dd2ad34841cb0
tree4637bde51fc7d39369c7ba1120272d7f0d16a5c1
parentc6105db8fc5996e4e3d43c2c4c8b32af64532b67
parent321277c59bfa5d7bb17d65170e9e729629829787
Merge from mainline.